From 7a61c7cf0c8d03fa9ef756c5c7f47303aa4c347f Mon Sep 17 00:00:00 2001 From: "cl349@firebug.cl.cam.ac.uk" Date: Thu, 12 May 2005 15:41:03 +0000 Subject: [PATCH] bitkeeper revision 1.1159.258.117 (4283790fhpDiiKA-POixMtbhwAG92Q) mk.linux-2.6-xenU, mk.linux-2.6-xen0, mk.linux-2.4-xenU, mk.linux-2.4-xen0: Honour EXTRAVERSION when trying to re-use a config file from a previous build. Signed-off-by: Christian Limpach --- buildconfigs/mk.linux-2.4-xen0 | 9 ++++----- buildconfigs/mk.linux-2.4-xenU | 9 ++++----- buildconfigs/mk.linux-2.6-xen0 | 9 ++++----- buildconfigs/mk.linux-2.6-xenU | 9 ++++----- 4 files changed, 16 insertions(+), 20 deletions(-) diff --git a/buildconfigs/mk.linux-2.4-xen0 b/buildconfigs/mk.linux-2.4-xen0 index 482bbb359c..dfa13af497 100644 --- a/buildconfigs/mk.linux-2.4-xen0 +++ b/buildconfigs/mk.linux-2.4-xen0 @@ -5,9 +5,7 @@ LINUX_SERIES = 2.4 EXTRAVERSION = xen0 -FULLVERSION = $(LINUX_VER)-$(EXTRAVERSION) - -LINUX_DIR = $(OS)-$(FULLVERSION) +LINUX_DIR = $(OS)-$(LINUX_VER)-$(EXTRAVERSION) include buildconfigs/Rules.mk @@ -39,8 +37,9 @@ $(LINUX_DIR)/include/linux/autoconf.h: ref-$(OS)-$(LINUX_VER) # add ebtables patch ( cd $(LINUX_DIR) ; patch -p1 -F3 < ../patches/tmp/ebtables.diff ) # Re-use config from install dir if one exits else use default config - [ -r $(DESTDIR)/boot/config-$(FULLVERSION) ] && \ - cp $(DESTDIR)/boot/config-$(FULLVERSION) $(LINUX_DIR)/.config \ + CONFIG_VERSION=$$(sed -ne 's/^EXTRAVERSION = //p' $(LINUX_DIR)/Makefile); \ + [ -r $(DESTDIR)/boot/config-$(LINUX_VER)$$CONFIG_VERSION ] && \ + cp $(DESTDIR)/boot/config-$(LINUX_VER)$$CONFIG_VERSION $(LINUX_DIR)/.config \ || cp $(LINUX_DIR)/arch/xen/defconfig-$(EXTRAVERSION) \ $(LINUX_DIR)/.config make -C $(LINUX_DIR) ARCH=xen oldconfig diff --git a/buildconfigs/mk.linux-2.4-xenU b/buildconfigs/mk.linux-2.4-xenU index 4053fde7d7..92ade5e3ac 100644 --- a/buildconfigs/mk.linux-2.4-xenU +++ b/buildconfigs/mk.linux-2.4-xenU @@ -5,9 +5,7 @@ LINUX_SERIES = 2.4 EXTRAVERSION = xenU -FULLVERSION = $(LINUX_VER)-$(EXTRAVERSION) - -LINUX_DIR = $(OS)-$(FULLVERSION) +LINUX_DIR = $(OS)-$(LINUX_VER)-$(EXTRAVERSION) include buildconfigs/Rules.mk @@ -32,8 +30,9 @@ $(LINUX_DIR)/include/linux/autoconf.h: ref-linux-$(LINUX_VER) sed -e 's/^EXTRAVERSION.*/&-$(EXTRAVERSION)/' Makefile >Mk.tmp ; \ rm -f Makefile ; mv Mk.tmp Makefile ) # Re-use config from install dir if one exits else use default config - [ -r $(DESTDIR)/boot/config-$(FULLVERSION) ] && \ - cp $(DESTDIR)/boot/config-$(FULLVERSION) $(LINUX_DIR)/.config \ + CONFIG_VERSION=$$(sed -ne 's/^EXTRAVERSION = //p' $(LINUX_DIR)/Makefile); \ + [ -r $(DESTDIR)/boot/config-$(LINUX_VER)$$CONFIG_VERSION ] && \ + cp $(DESTDIR)/boot/config-$(LINUX_VER)$$CONFIG_VERSION $(LINUX_DIR)/.config \ || cp $(LINUX_DIR)/arch/xen/defconfig-$(EXTRAVERSION) \ $(LINUX_DIR)/.config make -C $(LINUX_DIR) ARCH=xen oldconfig diff --git a/buildconfigs/mk.linux-2.6-xen0 b/buildconfigs/mk.linux-2.6-xen0 index 5eaa81ecc4..f55cf1a995 100644 --- a/buildconfigs/mk.linux-2.6-xen0 +++ b/buildconfigs/mk.linux-2.6-xen0 @@ -5,9 +5,7 @@ LINUX_SERIES = 2.6 EXTRAVERSION = xen0 -FULLVERSION = $(LINUX_VER)-$(EXTRAVERSION) - -LINUX_DIR = $(OS)-$(FULLVERSION) +LINUX_DIR = $(OS)-$(LINUX_VER)-$(EXTRAVERSION) include buildconfigs/Rules.mk @@ -32,8 +30,9 @@ $(LINUX_DIR)/include/linux/autoconf.h: ref-$(OS)-$(LINUX_VER) sed -e 's/^EXTRAVERSION.*/&-$(EXTRAVERSION)/' Makefile >Mk.tmp ; \ rm -f Makefile ; mv Mk.tmp Makefile ) # Re-use config from install dir if one exits else use default config - [ -r $(DESTDIR)/boot/config-$(FULLVERSION) ] && \ - cp $(DESTDIR)/boot/config-$(FULLVERSION) $(LINUX_DIR)/.config \ + CONFIG_VERSION=$$(sed -ne 's/^EXTRAVERSION = //p' $(LINUX_DIR)/Makefile); \ + [ -r $(DESTDIR)/boot/config-$(LINUX_VER)$$CONFIG_VERSION ] && \ + cp $(DESTDIR)/boot/config-$(LINUX_VER)$$CONFIG_VERSION $(LINUX_DIR)/.config \ || cp $(LINUX_DIR)/arch/xen/configs/$(EXTRAVERSION)_defconfig \ $(LINUX_DIR)/.config $(MAKE) -C $(LINUX_DIR) ARCH=xen oldconfig diff --git a/buildconfigs/mk.linux-2.6-xenU b/buildconfigs/mk.linux-2.6-xenU index b7dd424184..ac115ee372 100644 --- a/buildconfigs/mk.linux-2.6-xenU +++ b/buildconfigs/mk.linux-2.6-xenU @@ -5,9 +5,7 @@ LINUX_SERIES = 2.6 EXTRAVERSION = xenU -FULLVERSION = $(LINUX_VER)-$(EXTRAVERSION) - -LINUX_DIR = $(OS)-$(FULLVERSION) +LINUX_DIR = $(OS)-$(LINUX_VER)-$(EXTRAVERSION) include buildconfigs/Rules.mk @@ -32,8 +30,9 @@ $(LINUX_DIR)/include/linux/autoconf.h: ref-$(OS)-$(LINUX_VER) sed -e 's/^EXTRAVERSION.*/&-$(EXTRAVERSION)/' Makefile >Mk.tmp ; \ rm -f Makefile ; mv Mk.tmp Makefile ) # Re-use config from install dir if one exits else use default config - [ -r $(DESTDIR)/boot/config-$(FULLVERSION) ] && \ - cp $(DESTDIR)/boot/config-$(FULLVERSION) $(LINUX_DIR)/.config \ + CONFIG_VERSION=$$(sed -ne 's/^EXTRAVERSION = //p' $(LINUX_DIR)/Makefile); \ + [ -r $(DESTDIR)/boot/config-$(LINUX_VER)$$CONFIG_VERSION ] && \ + cp $(DESTDIR)/boot/config-$(LINUX_VER)$$CONFIG_VERSION $(LINUX_DIR)/.config \ || cp $(LINUX_DIR)/arch/xen/configs/$(EXTRAVERSION)_defconfig \ $(LINUX_DIR)/.config $(MAKE) -C $(LINUX_DIR) ARCH=xen oldconfig -- 2.30.2